lsb 3.1-17 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 022e33cb498629e5b0da51400c359687ae248216..a6ba9d5d27682b1f33ea6250e2a214c21c5c2daa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lsb (3.1-17) unstable; urgency=low
+
+  * Set FANCYTTY to a null string to cope with init scripts that for some
+    reason seem to use set -u.  (Closes: #390085)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Fri, 29 Sep 2006 01:50:51 -0500
+
 lsb (3.1-16) unstable; urgency=low
 
   * Improve documentation of killproc().  (Closes: #384814)

diff --git a/init-functions b/init-functions
index c4ddfc846f6b56478950194d8c994383c6b81316..65c6722883fd48ea1d880d6e0df5f79dd5280764 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -296,4 +296,5 @@ log_action_end_msg () {
     fi
 }
 
+FANCYTTY=
 [ -e /etc/lsb-base-logging.sh ] && . /etc/lsb-base-logging.sh || true

diff --git a/lsb_release b/lsb_release
index 2f1d992ef98ccc2d8bbf38250abe0e63929f17d2..016b4076d248d67ee844e76de4404f8e941e7fb2 100755 (executable)
--- a/lsb_release
+++ b/lsb_release
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # lsb_release command for Debian
-# (C) 2005 Chris Lawrence <lawrencc@debian.org>
+# (C) 2005-06 Chris Lawrence <lawrencc@debian.org>
 
 #    This package is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -56,6 +56,7 @@ def valid_lsb_versions(version, module):
 
     return [version]
 
+# This is Debian-specific at present
 def check_modules_installed():
     # Find which LSB modules are installed on this system
     output = commands.getoutput("dpkg-query -f '${Version} ${Provides}\n' -W %s 2>/dev/null" % PACKAGES)
@@ -153,10 +154,8 @@ def guess_debian_release():
 
     return distinfo
 
-def get_distro_information():
-    distinfo = guess_debian_release()
-
-    # Replace any info in /etc/lsb-release
+def get_lsb_information():
+    distinfo = {}
     if os.path.exists('/etc/lsb-release'):
         for line in open('/etc/lsb-release'):
             line = line.strip()
@@ -168,7 +167,11 @@ def get_distro_information():
                 if arg.startswith('"') and arg.endswith('"'):
                     arg = arg[1:-1]
                 distinfo[var] = arg
+    return distinfo
 
+def get_distro_information():
+    distinfo = guess_debian_release()
+    distinfo.update(get_lsb_information())
     return distinfo
     
 def main():